Auto merge of #1680 - steveklabnik:gh1679, r=alexcrichton
authorbors <bors@rust-lang.org>
Wed, 3 Jun 2015 15:29:16 +0000 (15:29 +0000)
committerbors <bors@rust-lang.org>
Wed, 3 Jun 2015 15:29:16 +0000 (15:29 +0000)
Fixes #1679


Trivial merge